Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx
authorWolfgang Denk <[email protected]>
Sat, 10 Dec 2011 21:44:01 +0000 (22:44 +0100)
committerWolfgang Denk <[email protected]>
Sat, 10 Dec 2011 21:44:01 +0000 (22:44 +0100)
* 'master' of git://git.denx.de/u-boot-mpc85xx:
  mpc85xx: Add board support for the eXMeritus HWW-1U-1A devices


Trivial merge